Rewrite clipboard handling so that the clipboard contents won't be freed

2004-10-26  Anders Carlsson  <andersca@imendio.com>

	* gtk/gtktextbuffer.c: (gtk_text_buffer_finalize),
	(create_clipboard_contents_buffer), (clipboard_get_contents_cb),
	(clipboard_clear_contents_cb), (cut_or_copy):
	Rewrite clipboard handling so that the clipboard contents won't be
	freed when the text buffer is finalized. Also add clipboard manager support.
	Fixes #95496.

diff --git a/ChangeLog b/ChangeLog
index 2840538f71bf8cf24f4806a519666b633009a1b8..62ca9d42757ca682fd30a94274d2da3397e9ccc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-26  Anders Carlsson  <andersca@imendio.com>
+
+       * gtk/gtktextbuffer.c: (gtk_text_buffer_finalize),
+       (create_clipboard_contents_buffer), (clipboard_get_contents_cb),
+       (clipboard_clear_contents_cb), (cut_or_copy):
+       Rewrite clipboard handling so that the clipboard contents won't be
+       freed when the text buffer is finalized. Also add clipboard manager support.
+       Fixes #95496.
+
 2004-10-25  Anders Carlsson  <andersca@gnome.org>
 
        * gtk/gtkentry.c: (gtk_entry_completion_timeout):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2840538f71bf8cf24f4806a519666b633009a1b8..62ca9d42757ca682fd30a94274d2da3397e9ccc8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2004-10-26  Anders Carlsson  <andersca@imendio.com>
+
+       * gtk/gtktextbuffer.c: (gtk_text_buffer_finalize),
+       (create_clipboard_contents_buffer), (clipboard_get_contents_cb),
+       (clipboard_clear_contents_cb), (cut_or_copy):
+       Rewrite clipboard handling so that the clipboard contents won't be
+       freed when the text buffer is finalized. Also add clipboard manager support.
+       Fixes #95496.
+
 2004-10-25  Anders Carlsson  <andersca@gnome.org>
 
        * gtk/gtkentry.c: (gtk_entry_completion_timeout):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2840538f71bf8cf24f4806a519666b633009a1b8..62ca9d42757ca682fd30a94274d2da3397e9ccc8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2004-10-26  Anders Carlsson  <andersca@imendio.com>
+
+       * gtk/gtktextbuffer.c: (gtk_text_buffer_finalize),
+       (create_clipboard_contents_buffer), (clipboard_get_contents_cb),
+       (clipboard_clear_contents_cb), (cut_or_copy):
+       Rewrite clipboard handling so that the clipboard contents won't be
+       freed when the text buffer is finalized. Also add clipboard manager support.
+       Fixes #95496.
+
 2004-10-25  Anders Carlsson  <andersca@gnome.org>
 
        * gtk/gtkentry.c: (gtk_entry_completion_timeout):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2840538f71bf8cf24f4806a519666b633009a1b8..62ca9d42757ca682fd30a94274d2da3397e9ccc8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2004-10-26  Anders Carlsson  <andersca@imendio.com>
+
+       * gtk/gtktextbuffer.c: (gtk_text_buffer_finalize),
+       (create_clipboard_contents_buffer), (clipboard_get_contents_cb),
+       (clipboard_clear_contents_cb), (cut_or_copy):
+       Rewrite clipboard handling so that the clipboard contents won't be
+       freed when the text buffer is finalized. Also add clipboard manager support.
+       Fixes #95496.
+
 2004-10-25  Anders Carlsson  <andersca@gnome.org>
 
        * gtk/gtkentry.c: (gtk_entry_completion_timeout):

diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 8d822ad356e6b2c92233c82f9b084d265fd04593..bdc18ca976b9caba17af8566d91846426743a8af 100644 (file)
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -113,10 +113,11 @@ static void gtk_text_buffer_real_changed               (GtkTextBuffer     *buffe
 static GtkTextBTree* get_btree (GtkTextBuffer *buffer);
 static void          free_log_attr_cache (GtkTextLogAttrCache *cache);
 
-static void remove_all_clipboard_contents_buffers (GtkTextBuffer *buffer);
 static void remove_all_selection_clipboards       (GtkTextBuffer *buffer);
 static void update_selection_clipboards           (GtkTextBuffer *buffer);
 
+static GtkTextBuffer *create_clipboard_contents_buffer (GtkTextBuffer *buffer);
+
 static GObjectClass *parent_class = NULL;
 static guint signals[LAST_SIGNAL] = { 0 };
 
@@ -436,7 +437,6 @@ gtk_text_buffer_finalize (GObject *object)
 
   buffer = GTK_TEXT_BUFFER (object);
 
-  remove_all_clipboard_contents_buffers (buffer);
   remove_all_selection_clipboards (buffer);
 
   if (buffer->tag_table)
@@ -2761,85 +2761,16 @@ clipboard_get_selection_cb (GtkClipboard     *clipboard,
     }
 }
 
-typedef struct
-{
-  GtkClipboard *clipboard;
-  GtkTextBuffer *buffer;
-} ContentsBuffer;
-
-static void
-remove_all_clipboard_contents_buffers (GtkTextBuffer *buffer)
-{
-  GSList *tmp_list = buffer->clipboard_contents_buffers;
-  while (tmp_list)
-    {
-      ContentsBuffer *contents_buffer = tmp_list->data;
-
-      g_object_unref (contents_buffer->buffer);
-      g_free (contents_buffer);
-         
-      tmp_list = tmp_list->next;
-    }
-
-  g_slist_free (buffer->clipboard_contents_buffers);
-  buffer->clipboard_contents_buffers = NULL;
-}
-
-static void
-remove_clipboard_contents_buffer (GtkTextBuffer *buffer,
-                                 GtkClipboard  *clipboard)
-{
-  GSList *tmp_list = buffer->clipboard_contents_buffers;
-  while (tmp_list)
-    {
-      ContentsBuffer *contents_buffer = tmp_list->data;
-      
-      if (contents_buffer->clipboard == clipboard)
-       {
-         buffer->clipboard_contents_buffers = g_slist_remove (buffer->clipboard_contents_buffers, contents_buffer);
-         
-         g_object_unref (contents_buffer->buffer);
-         g_free (contents_buffer);
-         
-         return;
-       }
-
-      tmp_list = tmp_list->next;
-    }
-}
-
 static GtkTextBuffer *
-get_clipboard_contents_buffer (GtkTextBuffer *buffer,
-                              GtkClipboard  *clipboard,
-                              gboolean       create)
+create_clipboard_contents_buffer (GtkTextBuffer *buffer)
 {
-  ContentsBuffer *contents_buffer;
-  GSList *tmp_list;
-
-  tmp_list = buffer->clipboard_contents_buffers;
-  while (tmp_list)
-    {
-      contents_buffer = tmp_list->data;
-      if (contents_buffer->clipboard == clipboard)
-       return contents_buffer->buffer;
-    }
-  
-  if (create)
-    {
-      contents_buffer = g_new (ContentsBuffer, 1);
-      contents_buffer->clipboard = clipboard;
-      contents_buffer->buffer = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
-
-      g_object_set_data (G_OBJECT (contents_buffer->buffer), "gtk-text-buffer-clipboard",
-                        GUINT_TO_POINTER (1));
+  GtkTextBuffer *contents;
 
-      buffer->clipboard_contents_buffers = g_slist_prepend (buffer->clipboard_contents_buffers, contents_buffer);
+  contents = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
 
-      
-      return contents_buffer->buffer;
-    }
-  else
-    return NULL;
+  g_object_set_data (G_OBJECT (contents), "gtk-text-buffer-clipboard", GINT_TO_POINTER (1));
+  
+  return contents;
 }
 
 /* Provide cut/copied data */
@@ -2849,11 +2780,9 @@ clipboard_get_contents_cb (GtkClipboard     *clipboard,
                            guint             info,
                            gpointer          data)
 {
-  GtkTextBuffer *buffer;
   GtkTextBuffer *contents;
 
-  buffer = GTK_TEXT_BUFFER (data);
-  contents = get_clipboard_contents_buffer (buffer, clipboard, FALSE);
+  contents = GTK_TEXT_BUFFER (data);
   
   g_assert (contents); /* This should never be called unless we own the clipboard */
 
@@ -2886,9 +2815,9 @@ static void
 clipboard_clear_contents_cb (GtkClipboard *clipboard,
                              gpointer      data)
 {
-  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
+  GtkTextBuffer *contents = GTK_TEXT_BUFFER (data);
 
-  remove_clipboard_contents_buffer (buffer, clipboard);
+  g_object_unref (contents);
 }
 
 static void
@@ -3512,19 +3441,20 @@ cut_or_copy (GtkTextBuffer *buffer,
       GtkTextIter ins;
       GtkTextBuffer *contents;
 
-      remove_clipboard_contents_buffer (buffer, clipboard);
-      contents = get_clipboard_contents_buffer (buffer, clipboard, TRUE);
+      contents = create_clipboard_contents_buffer (buffer);
 
       gtk_text_buffer_get_iter_at_offset (contents, &ins, 0);
       
       gtk_text_buffer_insert_range (contents, &ins, &start, &end);
                                     
-      if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets),
-                                         clipboard_get_contents_cb,
-                                         clipboard_clear_contents_cb,
-                                         G_OBJECT (buffer)))
-        clipboard_clear_contents_cb (clipboard, buffer);      
-
+      if (!gtk_clipboard_set_with_data (clipboard, targets, G_N_ELEMENTS (targets),
+                                       clipboard_get_contents_cb,
+                                       clipboard_clear_contents_cb,
+                                       contents))
+       g_object_unref (contents);
+      else
+       gtk_clipboard_set_can_store (clipboard, targets, G_N_ELEMENTS (targets) -1);
+                                    
       if (delete_region_after)
         {
           if (interactive)